Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 2 Jun 2010 11:55:37 +0000 (11:55 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 2 Jun 2010 11:55:37 +0000 (11:55 +0000)

Trivial merge